Refactored the Server to Seperate Data Storage and Networking