Finished initial refactoring of handlers.