Added preliminary framework for viewing annotations