added stuff to hw2, still doesn;t work