Slight progress on typechecking