did more work with the validation portion.

Signed-off-by: cauth0n <derekreimanis@yahoo.com>