Initial commit of SubjectsPlus 2.0