Gh 700

tested locally, ready for merge.