Hopefully nearly done with API doc markup