added new class.
remove autosave file
merge dev