* Complete code into class structure (doh!)
* Change query string to array