More progress on the refactor.