Got global CPU core stuff working
Conflict fix