Update from meeting

@tedlin182 can you approve?