added ability to add api_accounts
made all tests pass prior to merging with staging
Merge branch 'staging' into adding_api