Beginnings of CPU object, as well as modification using checkstyle
Merging conflicts