Added stuff to prepare for Assignment6