Late Night

Started some collision detection and a bit of organizing of some sloppy
code.