#83, refactor the database code to make it possible to add in the equivalent pieces
#83, refactor the database code to make it possible to add in the equivalent pieces

ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake