Added phase2, beginning work on parser.cpp