added hw2, havn't worked yet