Added project solution and some event diagnostics