Further work on trying to make this more of a "clean" setup.