Starting to flesh out the user API.
Merging.