lots of updates to DataFile Class, preparing for save / edit