Jnf/wordswordswords

These changes are being discussed in #12.