[WIP] Intermediate PULL for @IkeBart's changes.