Implemented BaseFileType, started work on Query