Diagonal validation is done, needs tested for bugs now