SRAMP-29 StoredQuery support

I'm going to go ahead and lie, claiming that I pasted nothing ;)