I assume that this will be uncommented once validator works?