Second Round of Blocking

Thanks. Almost done. :)