Class may be finished, will talk to Zach about further improvements