Add todo to remind me where I need to tackle #756