Added TODO's to SelectionManager
Updated controls