Final Touches

Collision Detection is still a bit wonky