First commit of tool to port to xAOD