Moved everything to one class.