Code review comment for lp:~jontai/openvista-gtm-integration/bug336166

This branch makes a large number of changes, so I'm putting it up for review early while I finish testing it. I don't anticipate any more big changes, but I might have to fix a thing or two if I find problems.