added a super class which the version 2 files pull from, updated code