Fixes #60 (closed)
Note: does not include entries for BSL and GUA. These will be completed in follow-up issues