Problem from last time solved, continuing work on parser