Revised a number of classes and added final simple functionality for thursdays test