@stephanfowler did I get the merge right here?