changed how the manager classes work, and updated all the classes affected by the change
Merge pull request #245 from jkuk/master

big changes in the manager classes