layout before return
new serialization/db store. Still work in progress