Oh right, also need to fix the sort order on insertions.