Added assignment 6 stuff