Cleaned up links and used persistent storage.
Merge pull request #57 from jwien001/demo

Cleaned up links and used persistent storage.