Began adding code for all 3 types of parsing