Continued work on type checking