WOOPSIE
changed the intersection code back to what worked best
Merge branch 'master' into SFML
have interactivity working and added a new model for the sake of posterity