Added measures view and model. Incomplete