Added classes

Several Additions and a few deletions.. I think.. XD