Finish parser first draft