Added new run script and dependency
Huge overhaul to client code