new controller on this branch

It looks good. /cc @Merbs