WIP: changes to run against remote; open issues/bugs with some of the changes