Add collision states
Add ability to invert screen and clean up code