last commit before client/server futzing
last commit before client/server futzing