refactored parameter system, in progress