Absolutely, as a matter of fact, you'll notice that's what I did in the last commit. here, the point is specifically to restrict functionality. Checkout the last commit individually, and associated unittest, and you'll get a better idea of what I'm going for.

As I said though, I may or may not keep that last pull.