More impl and doc work