Added classes and made mods