UserData stuff
Merge pull request #46 from Northcode/dev-Jens

UserData stuff