User storage stuff
Merge pull request #40 from Northcode/dev-Jens

User storage stuff