Cleaning Up
Adding extra server integration