Update

Removed two classes and added all the methods into one class.
Added new methods for when class numbers are not specified.