Added data persistence to machines, closes #95