added movement networking
fixed comflict