re: #290 Varek Raith

Yay! That gives us an excuse to expand it MUCH more!

/