This seems like it should go into the manager