Fxa proposal complete

For your review. Will squash em before merge, but leaving the commits for clairity.