initial "merge" from the Adiscon git