Added new unused object query method
Abstracted query logic
More stuff
Closing results
Renames