Added a bunch of (mostly empty) classes