finished TC4 + adjustments to DBStub class