Progress with Network Architecture

Still a lot to do before integrating with the project