still a wip but i worked a lil more today