It all builds!  Had to add back in the interfaces.  Wasn't a cleaner alternative that I saw.  Finally filled in a lot of the stubs and the network code is shaping up nicely.