05/08/2011 - Afternoon Commit

Additional work on feedback system complete while at work.