Merging db changes in so we can gather some code