All changes to classes are completed for now and no more bugs