added some classes

code is 50% more handsome!