first commit. partially implemented database interface
resolved merge issues