I skipped the adding of libraries because it was harder and I'm less
confident about getting it right.  Also I'm not sure why they are required
now and weren't required before.