Initial work on annotations.