User storage and builders, first pass.