Refactoring code to make it easier to test updates and added options to allow testing current prod environment via command line client