master: added classes that I totally forgot to push last time (yep).