Major update - goods, accounts partially implemented