refactored parameter system, nearly finished