moved account checking entirely to Account
moved account checking entirely to Account
Merge origin/master