6 Commits (feature/markerMode)