still working on getting tests passing after upstream merge