Do not pull this in!

This PR is mainly put in as a reference. You're welcome to cherry pick
certain commits but given that there is a failing test, you want to make
sure that if you pull it in,  you are prepared to do the work to make
the tests pass.

I added a nice helper for logging in though.