WIP #7, Closes #11