Start work on refactor