Finish parser and start 3add code