Mostly code from winter break.