Beginning work on better queries for stories. This probably breaks tests.