Began refactoring.
Merge branch 'development' of github.com:dchbx/gluedb into development