did some more stuff
wtf. hope this fixes my git problems
Started work on box2d implementation
merge