Some parser stuff is done
Merge