WIP #8

Ready.