Add some tests.
Refactor the Markers class.
Remove logging.