Pulling Mario's client branch work