Moved locations to json w/ service