first pass at params refactor in prep for OSX support