Appropriately splitting TODO items from main Elemental repository.