WIP #7, Closes #8