Progress on manager stuff