Got the basic tool working
Add to demo