Misguided Unit class design.
Revert "Misguided Unit class design."

This reverts commit 478abedb82b34f8cb150bd63659681fbc043617a.
Ready for another pass at the unit model.
Starts to sketch in regular object-based approach.