SQUASH THIS -- working on Parser class