Software from hw0 added to hw1