Feature/now 574

product should be included so tokens can't be randomly used throughout the site