Trying to clean up the design to allow for more modular representations