rolled back the networking functionality, for now
Merged latest changes from github about trajectory