Wire in a few config options + better logic.