adding time
cleaning up
validate
adding validation