Add nil

Not to merge yet — this is just the saved intermediate state.