Added tags, no remove/show tags function yet though