Working copy of the new commit. GameManager stuff not included.