is there an incremental step that gets most things working and that PR landed?