Datamodel start

Please review changes to banjo  data model,