Fourth Commit

Framework for query structures laid down and ready to be filled