Start making DiagApp a real class so we can start cleaning up this file.
Start making DiagApp a real class so we can start cleaning up this file.

datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador