Aastags

Added support for adding tags. It also contains previous stuff as it hasnt been incorporated to master. Let me know if i should pull request against another branch