Fixing up CPUActivity (WIP)