putting extra comments here and there and tagging...