more annotations: broken but it's coming along