Moved stuff from hw4/hw4 to hw4