WIP #7, Fixes #10