First pass at updated roadmap from SF meetings