got more done on collisions but still need to sort out moving entitiy collisions