added classes and stuff