Started refactoring Crowd.