-Remove Connection Class
-Change to Simulation Class