QueryReader.java is now working AFAIK
merge shit