More Modular!

Still need things to test though...