MET-428  Remainder of code from  Tag-library