Users

Let's merge this in and fix the remaining issues in separate branches.