Updated parsing for all ADTs. Still have two error