Break out DB::Vars into its own file
Merge commit '4e72423' into IntelliSurvey