Trying to make it a little more modular