added parse stuff
merge