Finish rearranging DB, should be functional