Much, much more modular