word-list code - needs merge from feature/cmd