Cal annotations

still wip