[#50602239] Stripped version. Work still in progress.