Annotated some important next steps via TODO tags.