sure... can probably move it to the parser