[wip] Progress.
[wip] Feel like a lot of work was undone here.
[wip] test: Fixing library tests.