continue to refactor controllers