Added New Classes...

see commits for more info.

and check out issue #23: