WIP started adding DB support