The economy part approaches functionality. Lots of old code to remove though.

Just started re-working the market component. New system will be much more simple.