collision detection planning

Planned what will be in the collision detection function, made some
minor variable name changes