Merge pull request #615 from jaypoulz/jp508

Jp508 -- Data saving is stable. No really. It's just the simulator.