Commit 37

Restructuring. Now trying to get merchant to work.