Part of the way too big commit