Started adding form view-model