Slowly adding in the parser