Filling out Query functionality
Added goals
Refactoring Queries