Merge pull request #10 from way2muchnoise/1.7-update

Network code is working
Merge pull request #11 from way2muchnoise/1.7-update

emitter updates