Parser works. Need to modifiy data structure