Fixes#3 WIP managers