Json pathing

Merge working service back into master