This would be a great win to get working, but it requires some `peek` changes that I couldn't land due to some weird exceptions and re-factoring