Better Makefile
Fixed Makefile
Finished database interface rewrite