Cleanup pass, broke common_strat into its own module.
Trying on forwards. Probably going to refactor into other modules.