Finally, progress!

I've finally managed to fix the collision system for Switch 2. It works beautifully! Now I can't wait to get started on porting all the power-ups from Switch 1, and adding new ones.