Added some new classes

Did this in Mono. Hope it's not busted.