Added some validation, needs more.