finished second class. Still need to test