Modulization

Do this already