initial setup
merging of text working, comments not tho