more work on controller stuff