Move code around, start on gradual melting