resolved conflicts and applied my refactor changes
added back postProcessFunc and commented out ssl until we have self signed dependencies