Emergency commit before I ship my laptop off