hopefully almost complete versions.  need some more network stuff