Starting to add collision stuff
Merge
More collision stuff
Player draws
Merge