Added bunch-o-new classes