Work on typechecker