Creating a tour done. Design correction and error handling is left.
Resolved conflicts