intermediate commit
formatted data-model, basic