Collisions Implemented

Worked on getting basic collisions working. Still need to be tweaked and
improved.