New annotations

Another take on annotations.