Fixin' up the Account model...It's late