upsert FTW. Compiles. No idea if worky.
bugfixes
Merge branch 'upsert' into dev
Added make-upsert to use in lieu of make-dao.
moar upsert
Added re-reads on make-upsert.
tweak to last commit