Added classes and stuff