Update parser with more of a bird's eye view