As we discussed on the phone, I decided to keep this simple for now, and it is slightly less messy since most of the related code is now fxa-client.