Training Tools

Merge with latest master
Need to pass dict param