Jhbate/shoreline

WIP for changes to user-api (shoreline)
You don't need to comment this part out yet -- just the call below. If you leave this uncommented, it can still be used manually for testing if you want.