Move towards type checking