Added some classes, mucked about
Actually added them...