WIP further integration with Totem.