Big commit after an absense.