Update on refactor progress