organizing a bit better in preparation to add more classes