Rebuild final.py - more agile; trying to garther the tools