Still one bug, but almost ready for version four - simpler routes… less spaghetti