Merge pull request #134 from cjoelrun/novanetworkblock

Novanetworkblock
Moar CODeZ
Merging all the things
Merge pull request #135 from xeregin/hatest

Moar CODeZ
race condition
Merge branch 'novanetworkblock' into ordering
Merge pull request #136 from cjoelrun/ordering

Ordering