controllers converted, tests converted and passing