More refactoring.
Finished most of connection.rb refactor.