Starting split work on type checking and name muddling