Add data models and finish demo app