Rearranged stuff
Crude db stuff