03/08/2013 - Afternoon Commit

Further development and testing of the resulting system.