Starting to address #17.