More progress with sqlite wrapper...