Gentoo Network changes and updates spiraled from Pull-Request#4

It has changes from Pull-Request#4, Legacy Support in same style and test-fixes for both.