Allow ; and - in history token.
wip.
add checkboxes.
Restructure to reduce missing parens pain.