APP6 Changes (first set)

Changes to tools to support 2 standards (2525 & APP6) and option to
choose