Started adding validation