fixed half the jdbc issue, but still needs work