Update #01

Removed extra classes.  Made everything run within one class now.