continuing, but need to commit to switch branches
finished mode-protected annotation, error-catch annotation, and a few test pages