Adds in annotation chart

Also refactors chart helpers to be shorter