User net dev

Merging some updates that were done on branch, but should be in master.