All db functionality done, async issues fixed