Update of app/controllers.  Lots of new code here.