June 12 3.0
Merge https://github.com/DMiller5383/Tealeaf