Jhbate/shoreline

WIP for changes to user-api (shoreline)