initial commitment
Merge https://github.com/me717/talisman