Wip/cookie 10.19.14