More work on the refactor.