-- More work on the manager classes