WIP: ParameterParser refactor almost done