Updated and Added classes

00:32 9/18/2014