work in progress on simpler data model