Feature/models

Working models as per our pair session. Please check and review.