work on typology, clean definitions