Preliminary commit before client <-> server