Big commit from a night of good work