Update on typechecker logic