Beginning switch to composer_manager

Need to test