Just wrestling with various settings and trying to abstract some of the code.

Signed-off-by: Shawn Laffan <shawnlaffan@gmail.com>