at least i can test that some of these changes pass...