matthewp/xhr, as promised.