Used Storeable, added serialization skeleton, refactored Command-s.