First step to modularity

It will hurt.