Lots more work on structuring of the appserver/database