Additional changes skipped in previous commit - basic connection and query functionality