added collision detection, still working on fixing collisions