Cleaned up. Fixed scoping issues.  Client-server requests working intermittently.