makin this shit way more modular YO