General Code cleanup
Rough draft of collisions and maps