Adding the last of the classes as well as a few modifications.

Now the fun begins.

Signed-off-by: Daniel Carbone <daniel.p.carbone@gmail.com>