Flagging bits

merge feature/my-tags first!