controllers and classes common working on #776