DataContainer overhaul and tests.