work in progress for #7