Start working on refactor