Starting to add tags & tag message queue