Continuing to rewrite codebase to conform to new system