Without getting too specific in this commit message: added stuff.
Committed more random stuff, that I am not saying in this message, but you can probably guess from the class names.