add remaining mappings, including todos where necessary