SRAMP-29 StoredQuery support

Also here... ok fine just format the whole file!  ;)