Started adding tagfunctionality