Boom shacka lacka boom

Changed and added thee classes.