more model work. Need to get unique validation right