will see if i will get to this this time or defer to later, I need to touch both wrapper and parser anyway