Cleaned up Upsert Play, TODO doc updated