Beginnings of the structure
Added basic query functionality.