ParametersParser refacor

WIP
Ah frak, right we have discussed it already. Sorry.