refactored users creation and milestones, added cr management