Refactored SettignsManager
Started some major work on Teams