Refactor + Multiple Environments

Adding a more robust approach to #7 in this refactor