wip - Update docs and code.