Jp508 -- Potentially finished added data saving to manual

avoiding merge conflicts and potentially adding data saving to manual

#508