Added assignment3 stuff