Cortex Refactor/Redesign