Refactored classes, DB GUI work begins