This PR is an attempt to make the review and merge of @gelma's #1077 PR more manageable. It covers words starting from A to I (hence part 1 of 2). There have been some additions as well as squashed down commits.
