Verify everything is on the account level scope closes #152.