Revert "Finished product (4/5/13)"

This reverts commit a36e2b319311c47b308ac072c5dd2661b343c758.