More work on controllers...

Requires Lift.