this probably makes sense for storage independence but couch will do this automatically. Should we keep doing it ourselves?