Work on the Parser, finalize