Updated Parser -- almost finished