Updated code for midterm

Nearly done code for midterm - need to fix collision detection