Tons of progress.  Almost ready to test data saving.