Fixed Empty class bug, added 2nd class time, added file dump