Refactor towards a more object-oriented architecture
Continue towards a better object-oriented architecture, and expose more numbers to variables (eventually will be in config file)