Jhbate/shoreline

WIP for changes to user-api (shoreline)
yeah I just commented out the whole block so it was very clear