WIP - clean off the temp ids and save.