Did a bit of a rewrite of the Manager