ParametersParser refacor

WIP
This should work too. (not sure where is the WIP line)