rearrange innards + save
save&load
Merge pull request #1 from hijackert/dev

Dev