I'm coming to the conclusion that forward planning would have been helpful. Unfortunately, I've realized this at the point where I end up doing backward planning.

Reworking the BaseObject class with code from the player class, resulting in headaches.