Query string support

This PR will eventually feature query string support.