Amend foo and add ba[xz] (server/client branches rebase)