WIP rewrite of Data objects -- remove explicit instantiation of template types, consolidate headers, move persistence code to another module