Most todos out just need pnet/snet
stable
Merge pull request #1 from mpath/fixing_todos

Fixing todos