Continue working on refactor