Laying the groundwork for a refactor