Start work on an even more modular approach