Merge attempt

Mark, see the merge I did at the top. I think you just have to copy and paste code from the Network submodule of the compiler to the Dehop module.