Matthew, how'd this turn out? I'm actually experiencing a similar issue trying to implement something similar. Did you have to provide explicit definition of

today

&

tomorrow

?