Adding validation - not fully functionnal...