[WIP] - Client impl continues.