More work toward saving data

Still currently broken. Just committing to share code between
computers..