Added all new classes from Zac.
some