Moving over some more late night work