Working collisions

Though hitboxes need fixing up