Another smux commit. Needs a rebase.
smux updates. Needs a rebase.