massive changes; new oop database interface; removed test data