Collision Detection update

More efficient easier to read collision detection also started adding an
easier keyboard interface