Getting rid of nasty hardcoded chunks
Modularizing code. So much easier when not tired
Modularity complete. woot.
Broke out functions into separate files