Big logic changes, more cookies to nom on