Partial work on PersistentPlayer system. This is a non-compiling commit - don't select this revision.