Saving; file structure changes; still no comments implementation