Dev

Complete rework of the data model.