Finished assignment

Final changes made to Q1-Q5