Added external library - again. Library better constructed.