Initial work to address #2