Some more scribbles, more-or-less functional marker tracking
Merge remote-tracking branch 'origin/master'