Refactor

Adding networking changes to develop