at least it compiles now, and the docs are mostly in place