doing clean up
merging
updating honeymon and adding contact templates
merging again