Continuing scrappy work on annotations