added routes!
merging