Commit prior to any testing
v1.0B
Added final features for 4/7/13 demo