Machers now return data
Refactored executeQuery into class