Preparing for a big refactor