Fixed file read bug and made some Query classes I may or may not use.