Another MAJOR refactor to boilerplate structure.