Closes #12, thank god