massive commit for winter break work