Issac and I layed out our new network diagram.  This is what we came up with.  I have a much bigger version that shows more detail, but I thought for "posting" I would make it a little smaller.