Implemented Feature X, issue #6

Let's see how this plays out.