Nomenclature; prepare to move data handling elsewhere
New data handling class, draft form