merging so we can get on with integrating tests