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

This reverts commit 6c21d92cbfe91ab73ab83a97f66916b8558f51ef.