Saving .idea
corrected merge issues
Cleaning up .idea a little.
network refactoring