Starting to add Type system.