Adding more stuff to complete Ch. 1