Added ability to run client from main file, etc