If you are looking for a problem book I like the Zaccaro book, Primary Grade challenge Math (they should pay me for all advertisement I do smile

I have only seen samples from the Math Detective books, but it could be what you are looking for
http://www.criticalthinking.com/get...ction_to_display=product_sample_page.jsp

They also have a computer version.

LMom