Finished up V1. Added V1.1 classes