merge
multiplayer logic, includes interval tag setting behaviour on server side that needs fixing