Major refactor. Config handles -most- of this wrapper now.