Continuing to unfuck refactor.