network and animation stuff by harrison
Merge remote-tracking branch 'origin/master'