Intermediate commit. Working on dox.