Hopefully the last commit for hw3