Made it 100% more modular