Makin' it modular