Make this a little more modular.