cleaning up some naming stuff
more cleaning
more cleaning
final round of filename cleaning
collision detection for character
Attempting to merge