OK!
Add some more functionality per Zev's request