Last commit was pretty badly broken server client handle side.