Training Tools

Merge with latest master
Need to pass the dictionary into this.