Data route params

We could use the functionality provided in #847, so I've addressed @pushrax's comments so that we can hopefully get it merged it into master.

Thoughts?