Add JSON serialization to Model
Tweak Model serialization
Add JSON serialization to SetModel
Vastly simplify Storage class