Algo not yet done, refactored SQL query class.