Start migrating to delegated objects, get code out of controller