One last big commit before calling it a day.