Changes after in person review with @ellisonbg including TODO tags