manually merging in all the changes from @katherine's pull on futura

This seeeems to work?