Major Update

Class name changes.
Added new functions.
Overall Major Overhaul