added controller + test + config updates