Rewrote parser to have new structure