Attempting a more modular design