make it modular done woohoo