added categories, eliminated polymorphism from account