more progress towards annotations