 - more demo structures / templates
 - better documentation
 - combining mark and move modes without losing functionality
