In progress work for fixing #4