ClientHandler.cs refactor - Doesn't build switching PC's.