Massive core changes...