Updates based on in-person meeting with Eric Stocker