Final commit for work, everything is functional

April 30, 2013