Big commit prior to switching operating systems