CUP Formatting

Merge if you want, leave otherwise, as discussed in #7 

One question as well, all the empty classes, do they need to be there? I guess for easy of updating, seeing what has changed? But could something brake if CUP changes it or something?