Adding classes

seeing if this might make it more organized.