Type checker changes
unmerged files