First steps to address #11