working on the markers
Merge branch 'biggs'