Trying to make more modular

e