Preliminary economic changes

Ready for testing