Added some parts I skipped, continuing on where I left off.