Added two new classes and patched up some stuff! :)