Good progress, need to sort out annotation lookup