Manager updates

work in progress