TODO denormalization and tools notes