Moving more stuff to Wiki.php