Starting the cleanup of the old way of parsing

New way with type deduction should be nicer