merged Dave's changes and added widgetcontroller for revenuesources