Preparation for constants file, and updated database stuff.