Interim work on models and storage