Port more stuff to shin