Added QueryMapper by Joe Modjeski
Commented out bad line until I get it working