Adding and implementing tags

@wallawe This adds tags.