making modular
making it modular