[WIP] add locations to clients