Made it pretty, collisions somewhat working