Tour II revamp

Still needs to be finished - need clarification from Oleg on a few
sections.