Started breaking the different modules off into separate classes.