Reorg and started fixing addition