the calm before refactoring marks
some of the chaos cleared up
mark logic separated from display (latter still unfinished)