- Add more scenarios
- Move marker logic to it own class.