Need to set values and add detail view and properties