This is fine for now, I guess. Your points about validation are good.