More work for Issue #9. Toggling on and off annotations.