Final Commit. Added Menu option. Not tested in TC.