zrrichards: Finished refactoring