W8 Client Re-Factor