Bunch of clean-up with collision code
More clean-up
Duplicating main again (I'm not sure why I do this but it's convenient)
Actually adding Main7.js--oops