Fixed some class issues, added collide class. Fix

Collide class needs work with the inheritance.