Added validation, not complete yet

Signed-off-by:  <akorolex>