Add Lists. Improve tests and quality. Listener now becomes KeywordListener.