Work on adding markers
Merge branch 'marker-work'