Added missing imports, commented out other code

Commented out code will be moved to Client.py (which will be renamed to Networking.py).