Interim commit, handle keys