Yeah we shouldn't mix function changes with this reorg.