Broke the code up into modules, much better