refactor to have most things say they are only taking data in / data out. also added usersDemandAccounts