first pass at updating to 1.7
network stuff still not fixed