That needed to be configurable.
Some housekeeping...