V3 API changes going well.

Removed most of the bad parts. I want to finish removing dependency on
gapi client and finish testing.