Feature/1 jan validator

#1