I moved some stuff out of the Manager class into other classes