first commit on refactored Managers