Working on adding nics.
Merge branch 'test' into dev