Moved everthing for hw3