A bit more hacking on the user-front, commit to keep git quiet on pull...