Completed Done #11. Also improved the PageLink code since it hadn't been touched in years.