still oogly, but cleaned up the tmp parser a bit