Overhauling
Simplifying
WIP - nailing down behavior