Deprecated Headers reimplmented in refactor

Also thought there was a bug with ParameterParser. Turns out all is well.