Merge the net hash into network object

This is just the first step to clean it up. Next we should properly split the options to where it belongs...

Closes #85 (closed)