finally do DB things the right way!
Merge