Final commits before Eric's OICR internship