Made Charlie appear in spirit
Did some more stuff
Merge pull request #2 from infd/master

Made Charlie appear in spirit