WIP - Some working stuff, tests pass or skip.