Redo of CotS (Commercial off the Shelf) code