Ye olde Thursday commit. Took a lot of focus away from sql_query.py and put it back into some of the object files, where it rightfully belonged.