More WIP on #96