Do not jump ahead on that refactor just yet.