Just updating my CP-10 branch

From this i'll just apply what i've changed manually due to the addition of several classes. Shouldn't take too long