US Census

17 files changed, 291 insertions, 43 deletions

diff --git a/app/Census/CensusColumnBirthDate.php b/app/Census/CensusColumnBirthDate.php
index ba5f07665f..6a773717fb 100644
--- a/app/Census/CensusColumnBirthDate.php
+++ b/app/Census/CensusColumnBirthDate.php
@@ -31,6 +31,6 @@ class CensusColumnBirthDate extends AbstractCensusColumn implements CensusColumn
 	 * @return string
 	 */
 	public function generate(Individual $individual, Individual $head = null) {
-		return $individual->getEstimatedBirthDate()->display(false, null, false);
+		return $individual->getEstimatedBirthDate()->minimumDate()->format('%j %n %Y');
 	}
 }
diff --git a/app/Census/CensusColumnBirthMonth.php b/app/Census/CensusColumnBirthMonth.php
new file mode 100644
index 0000000000..333dac29fa
--- /dev/null
+++ b/app/Census/CensusColumnBirthMonth.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The individual's date of birth.
+ */
+class CensusColumnBirthMonth extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual      $individual
+	 * @param Individual|null $head
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual, Individual $head = null) {
+		return $individual->getEstimatedBirthDate()->minimumDate()->format('%M');
+	}
+}
diff --git a/app/Census/CensusOfUnitedStates1940.php b/app/Census/CensusColumnBirthYear.php
index a6a259590b..dbee84762a 100644
--- a/app/Census/CensusOfUnitedStates1940.php
+++ b/app/Census/CensusColumnBirthYear.php
@@ -15,27 +15,22 @@
  */
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
 /**
- * Definitions for a census
+ * The individual's date of birth.
  */
-class CensusOfUnitedStates1940 extends CensusOfUnitedStates implements CensusInterface {
+class CensusColumnBirthYear extends AbstractCensusColumn implements CensusColumnInterface {
 	/**
-	 * When did this census occur.
+	 * Generate the likely value of this census column, based on available information.
 	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 APR 1940';
-	}
-
-	/**
-	 * The columns of the census.
+	 * @param Individual      $individual
+	 * @param Individual|null $head
 	 *
-	 * @return CensusColumnInterface[]
+	 * @return string
 	 */
-	public function columns() {
-		return array(
-			new CensusColumnNull($this, 'XXXX', 'XXXX'),
-		);
+	public function generate(Individual $individual, Individual $head = null) {
+		return $individual->getEstimatedBirthDate()->minimumDate()->format('%M');
 	}
 }
diff --git a/app/Census/CensusColumnGivenNameInitial.php b/app/Census/CensusColumnGivenNameInitial.php
new file mode 100644
index 0000000000..d2ede8bd2a
--- /dev/null
+++ b/app/Census/CensusColumnGivenNameInitial.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The individual's full name.
+ */
+class CensusColumnGivenNameInitial extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual      $individual
+	 * @param Individual|null $head
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual, Individual $head = null) {
+		foreach ($individual->getAllNames() as $name) {
+			$given = $name['givn'];
+			if (strpos($given, ' ') === false) {
+				return $given;
+			} else {
+				return substr($given, 0, strpos($given, ' ') + 2);
+			}
+		}
+
+		return '';
+	}
+}
diff --git a/app/Census/CensusColumnSurnameGivenNameInitial.php b/app/Census/CensusColumnSurnameGivenNameInitial.php
new file mode 100644
index 0000000000..942be6893a
--- /dev/null
+++ b/app/Census/CensusColumnSurnameGivenNameInitial.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The individual's full name.
+ */
+class CensusColumnSurnameGivenNameInitial extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual      $individual
+	 * @param Individual|null $head
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual, Individual $head = null) {
+		foreach ($individual->getAllNames() as $name) {
+			$given = $name['givn'];
+			if (strpos($given, ' ') === false) {
+				return $name['surn'] . ', ' . $given;
+			} else {
+				return $name['surn'] . ', ' . substr($given, 0, strpos($given, ' ') + 2);
+			}
+		}
+
+		return '';
+	}
+}
diff --git a/app/Census/CensusOfScotland1861.php b/app/Census/CensusOfScotland1861.php
index 8af866a3be..03dde33e0e 100644
--- a/app/Census/CensusOfScotland1861.php
+++ b/app/Census/CensusOfScotland1861.php
@@ -43,7 +43,7 @@ class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface {
 			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
 			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
 			new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
-			new CensusColumnNull($this, 'Sch', 'Number of children between 5 and 13 attending school'),
+			new CensusColumnNull($this, 'School', 'Number of children between 5 and 13 attending school'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1871.php b/app/Census/CensusOfScotland1871.php
index 542207ec55..1ced48c593 100644
--- a/app/Census/CensusOfScotland1871.php
+++ b/app/Census/CensusOfScotland1871.php
@@ -43,7 +43,7 @@ class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface {
 			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
 			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
 			new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'),
-			new CensusColumnNull($this, 'Sch', 'Number of children between 5 and 13 attending school or educated at home'),
+			new CensusColumnNull($this, 'School', 'Number of children between 5 and 13 attending school or educated at home'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates.php b/app/Census/CensusOfUnitedStates.php
index dddc2edd42..8508161f48 100644
--- a/app/Census/CensusOfUnitedStates.php
+++ b/app/Census/CensusOfUnitedStates.php
@@ -35,7 +35,6 @@ class CensusOfUnitedStates extends Census implements CensusPlaceInterface {
 			new CensusOfUnitedStates1910(),
 			new CensusOfUnitedStates1920(),
 			new CensusOfUnitedStates1930(),
-			new CensusOfUnitedStates1940(),
 		);
 	}
 
diff --git a/app/Census/CensusOfUnitedStates1850.php b/app/Census/CensusOfUnitedStates1850.php
index 0e860e6d57..a51ee5ecec 100644
--- a/app/Census/CensusOfUnitedStates1850.php
+++ b/app/Census/CensusOfUnitedStates1850.php
@@ -43,7 +43,7 @@ class CensusOfUnitedStates1850 extends CensusOfUnitedStates implements CensusInt
 			new CensusColumnNull($this, 'RE', 'Value of real estate owned'),
 			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
 			new CensusColumnMarriedWithinYear($this, 'Mar', 'Married within the year'),
-			new CensusColumnNull($this, 'Sch', 'Attended school within the year'),
+			new CensusColumnNull($this, 'School', 'Attended school within the year'),
 			new CensusColumnNull($this, 'R+W', 'Persons over 20 years of age who cannot read and write'),
 			new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, idiotic, pauper or convict'),
 		);
diff --git a/app/Census/CensusOfUnitedStates1860.php b/app/Census/CensusOfUnitedStates1860.php
index 403495bbd9..8457c16d78 100644
--- a/app/Census/CensusOfUnitedStates1860.php
+++ b/app/Census/CensusOfUnitedStates1860.php
@@ -44,7 +44,7 @@ class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInt
 			new CensusColumnNull($this, 'PE', 'Value of personal estate owned'),
 			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
 			new CensusColumnMarriedWithinYear($this, 'Mar', 'Married within the year'),
-			new CensusColumnNull($this, 'Sch', 'Attended school within the year'),
+			new CensusColumnNull($this, 'School', 'Attended school within the year'),
 			new CensusColumnNull($this, 'R+W', 'Persons over 20 years of age who cannot read and write'),
 			new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, idiotic, pauper or convict'),
 		);
diff --git a/app/Census/CensusOfUnitedStates1870.php b/app/Census/CensusOfUnitedStates1870.php
index dfe1df29fe..366e1f9b9c 100644
--- a/app/Census/CensusOfUnitedStates1870.php
+++ b/app/Census/CensusOfUnitedStates1870.php
@@ -47,9 +47,9 @@ class CensusOfUnitedStates1870 extends CensusOfUnitedStates implements CensusInt
 			new CensusColumnMotherForeign($this, 'MFB', 'Mother of foreign birth'),
 			new CensusColumnMonthIfBornWithinYear($this, 'Born', 'If born within the year, state month'),
 			new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'If married within the year, state month'),
-			new CensusColumnNull($this, 'Sch', 'Attended school within the year'),
-			new CensusColumnNull($this, 'R', 'Cannot read'),
-			new CensusColumnNull($this, 'W', 'Cannot write'),
+			new CensusColumnNull($this, 'School', 'Attended school within the year'),
+			new CensusColumnNull($this, 'Read', 'Cannot read'),
+			new CensusColumnNull($this, 'Write', 'Cannot write'),
 			new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, or idiotic'),
 			new CensusColumnNull($this, 'Cit', 'Male citizen of US'),
 			new CensusColumnNull($this, 'Dis', 'Male citizen of US, where right to vote is denied or abridged'),
diff --git a/app/Census/CensusOfUnitedStates1880.php b/app/Census/CensusOfUnitedStates1880.php
index acdb055399..059e55acd4 100644
--- a/app/Census/CensusOfUnitedStates1880.php
+++ b/app/Census/CensusOfUnitedStates1880.php
@@ -40,24 +40,24 @@ class CensusOfUnitedStates1880 extends CensusOfUnitedStates implements CensusInt
 			new CensusColumnSexMF($this, 'Sex', 'Sex'),
 			new CensusColumnMonthIfBornWithinYear($this, 'Mon', 'If born within the year, state month'),
 			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
-			new CensusColumnNull($this, 'S', 'Single'),
-			new CensusColumnNull($this, 'M', 'Married'),
-			new CensusColumnNull($this, 'W', 'Widowed, Divorced'),
+			new CensusColumnNull($this, 'Single', 'Single'),
+			new CensusColumnNull($this, 'Married', 'Married'),
+			new CensusColumnNull($this, 'Write', 'Widowed, Divorced'),
 			new CensusColumnNull($this, 'MY', 'Married during census year'),
 			new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
 			new CensusColumnNull($this, 'Un', 'Number of months the person has been unemployed during the census year'),
 			new CensusColumnNull($this, 'Sick', 'Sickness or disability'),
-			new CensusColumnNull($this, 'Bl', 'Blind'),
+			new CensusColumnNull($this, 'Blind', 'Blind'),
 			new CensusColumnNull($this, 'DD', 'Deaf and dumb'),
-			new CensusColumnNull($this, 'Id', 'Idiotic'),
-			new CensusColumnNull($this, 'In', 'Insane'),
-			new CensusColumnNull($this, 'Dis', 'Maimed, crippled, bedridden or otherwise disabled'),
-			new CensusColumnNull($this, 'Sch', 'Attended school within the census year'),
-			new CensusColumnNull($this, 'R', 'Cannot read'),
-			new CensusColumnNull($this, 'W', 'Cannot write'),
-			new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth, naming the state, territory, or country'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father, naming the state, territory, or country'),
-			new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother, naming the state, territory, or country'),
+			new CensusColumnNull($this, 'Idiotic', 'Idiotic'),
+			new CensusColumnNull($this, 'Insane', 'Insane'),
+			new CensusColumnNull($this, 'Disabled', 'Maimed, crippled, bedridden or otherwise disabled'),
+			new CensusColumnNull($this, 'School', 'Attended school within the census year'),
+			new CensusColumnNull($this, 'Read', 'Cannot read'),
+			new CensusColumnNull($this, 'Write', 'Cannot write'),
+			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Father’s birthplace', 'Place of birth of father, naming the state, territory, or country'),
+			new CensusColumnMotherBirthPlaceSimple($this, 'Mother’s birthplace', 'Place of birth of mother, naming the state, territory, or country'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1890.php b/app/Census/CensusOfUnitedStates1890.php
index 532d1f1fee..27eca4dcb7 100644
--- a/app/Census/CensusOfUnitedStates1890.php
+++ b/app/Census/CensusOfUnitedStates1890.php
@@ -35,7 +35,30 @@ class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInt
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnNull($this, 'XXXX', 'XXXX'),
+			new CensusColumnGivenNameInitial($this, 'Name', 'Christian name in full, and initial of middle name'),
+			new CensusColumnSurname($this, 'Surname', 'Surname'),
+			new CensusColumnNull($this, 'CW', 'Whether a soldier, sailor or marine during the civil war (U.S. or Conf.), or widow of such person'),
+			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of family'),
+			new CensusColumnNull($this, 'Race', 'Whether white, black, mulatto, quadroon, octoroon, Chinese, Japanese, or Indian'),
+			new CensusColumnSexMF($this, 'Sex', 'Sex'),
+			new CensusColumnAge($this, 'Age', 'Age at nearest birthday.  If under one year, give age in months'),
+			new CensusColumnNull($this, 'Condition', 'Whether single, married, widowed, or divorced'),
+			new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'Whether married duirng the census year (June 1, 1889, to May 31, 1890)'),
+			new CensusColumnNull($this, 'Children', 'Mother of how many children, and number of these children living'),
+			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Father’s birthplace', 'Place of birth of father'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Mother’s birthplace', 'Place of birth of mother'),
+			new CensusColumnNull($this, 'US', 'Number of years in the United States'),
+			new CensusColumnNull($this, 'Nat', 'Whether naturalized'),
+			new CensusColumnNull($this, 'Papers', 'Whether naturalization papers have been taken out'),
+			new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, occupation'),
+			new CensusColumnNull($this, 'Unemployed', 'Months unemployed during the census year (June 1, 1889, to May 31, 1890)'),
+			new CensusColumnNull($this, 'Read', 'Able to read'),
+			new CensusColumnNull($this, 'Write', 'Able to write'),
+			new CensusColumnNull($this, 'English', 'Able to speak English.  If not the language or dialect spoken'),
+			new CensusColumnNull($this, 'Disease', 'Whether suffering from acute or chronic disease, with name of disease and length of time afflicted'),
+			new CensusColumnNull($this, 'Infirm', 'Whether defective in mind, sight, hearing, or speech, or whether crippled, maimed, or deformed, with name of defect'),
+			new CensusColumnNull($this, 'Prisoner', 'Whether a prisoner, convict, homeless child, or pauper'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1900.php b/app/Census/CensusOfUnitedStates1900.php
index beef1e841e..ee8a43ca9d 100644
--- a/app/Census/CensusOfUnitedStates1900.php
+++ b/app/Census/CensusOfUnitedStates1900.php
@@ -35,7 +35,32 @@ class CensusOfUnitedStates1900 extends CensusOfUnitedStates implements CensusInt
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnNull($this, 'XXXX', 'XXXX'),
+			new CensusColumnFullName($this, 'Name', 'Name'),
+			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+			new CensusColumnNull($this, 'Race', 'Color or race'),
+			new CensusColumnSexMF($this, 'Sex', 'Sex'),
+			new CensusColumnBirthMonth($this, 'Month', 'Month of birth'),
+			new CensusColumnBirthYear($this, 'Year', 'Year of birth'),
+			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
+			new CensusColumnNull($this, 'Condition', 'Whether single, married, widowed, or divorced'),
+			new CensusColumnYearsMarried($this, 'Marr', 'Number of years married'),
+			new CensusColumnChildrenBornAlive($this, 'Chil', 'Mother of how many children'),
+			new CensusColumnChildrenLiving($this, 'Chil', 'Number of these children living'),
+			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth of this person'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Father’s birthplace', 'Place of birth of father of this person'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Mother’s birthplace', 'Place of birth of mother of this person'),
+			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
+			new CensusColumnNull($this, 'US', 'Number of years in the United States'),
+			new CensusColumnNull($this, 'Nat', 'Naturalization'),
+			new CensusColumnOccupation($this, 'Occupation', 'Occupation, trade of profession'),
+			new CensusColumnNull($this, 'Unemployed', 'Months not unemployed'),
+			new CensusColumnNull($this, 'School', 'Attended school (in months)'),
+			new CensusColumnNull($this, 'Read', 'Can read'),
+			new CensusColumnNull($this, 'Write', 'Can write'),
+			new CensusColumnNull($this, 'English', 'Can speak English'),
+			new CensusColumnNull($this, 'Home', 'Owned or rented'),
+			new CensusColumnNull($this, 'Mort', 'Owned free or mortgaged'),
+			new CensusColumnNull($this, 'Farm', 'Farm or house'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1910.php b/app/Census/CensusOfUnitedStates1910.php
index 4a1d100f31..beffa944a9 100644
--- a/app/Census/CensusOfUnitedStates1910.php
+++ b/app/Census/CensusOfUnitedStates1910.php
@@ -35,7 +35,35 @@ class CensusOfUnitedStates1910 extends CensusOfUnitedStates implements CensusInt
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnNull($this, 'XXXX', 'XXXX'),
+			new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
+			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+			new CensusColumnSexMF($this, 'Sex', 'Sex'),
+			new CensusColumnNull($this, 'Race', 'Color or race'),
+			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
+			new CensusColumnNull($this, 'Condition', 'Whether single, married, widowed, or divorced'),
+			new CensusColumnYearsMarried($this, 'Marr', 'Number of years of present marriage'),
+			new CensusColumnChildrenBornAlive($this, 'Chil', 'Mother of how many children'),
+			new CensusColumnChildrenLiving($this, 'Chil', 'Number of these children living'),
+			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth of this person'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Father’s birthplace', 'Place of birth of father of this person'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Mother’s birthplace', 'Place of birth of mother of this person'),
+			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
+			new CensusColumnNull($this, 'Nat', 'Whether naturalized or alien'),
+			new CensusColumnNull($this, 'Language', 'Whether able to speak English, of if not, give language spoken'),
+			new CensusColumnOccupation($this, 'Occupation', 'Trade or profession of, or particular kind of work done by this person'),
+			new CensusColumnNull($this, 'Ind', 'General nature of industry'),
+			new CensusColumnNull($this, 'Emp', 'Whether an employer, employee, or work on own account'),
+			new CensusColumnNull($this, 'Unemployed', 'Whether out of work on April 15, 1910'),
+			new CensusColumnNull($this, 'Unemployed', 'Number of weeks out of work in 1909'),
+			new CensusColumnNull($this, 'Read', 'Whether able to read'),
+			new CensusColumnNull($this, 'Write', 'Whether able to write'),
+			new CensusColumnNull($this, 'School', 'Attended school since September 1, 1909'),
+			new CensusColumnNull($this, 'Home', 'Owned or rented'),
+			new CensusColumnNull($this, 'Mort', 'Owned free or mortgaged'),
+			new CensusColumnNull($this, 'Farm', 'Farm or house'),
+			new CensusColumnNull($this, 'CW', 'Whether a survivor of the Union or Confederate Army or Navy'),
+			new CensusColumnNull($this, 'Blind', 'Whether blind (both eyes)'),
+			new CensusColumnNull($this, 'Deaf', 'Whether deaf and dumb'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1920.php b/app/Census/CensusOfUnitedStates1920.php
index 45e3750743..de3fd47df7 100644
--- a/app/Census/CensusOfUnitedStates1920.php
+++ b/app/Census/CensusOfUnitedStates1920.php
@@ -35,7 +35,30 @@ class CensusOfUnitedStates1920 extends CensusOfUnitedStates implements CensusInt
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnNull($this, 'XXXX', 'XXXX'),
+			new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
+			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+			new CensusColumnNull($this, 'Home', 'Owned or rented'),
+			new CensusColumnNull($this, 'Mort', 'If owned, free or mortgaged'),
+			new CensusColumnSexMF($this, 'Sex', 'Sex'),
+			new CensusColumnNull($this, 'Race', 'Color or race'),
+			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
+			new CensusColumnNull($this, 'Condition', 'Whether single, married, widowed, or divorced'),
+			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
+			new CensusColumnNull($this, 'Nat', 'Naturalized or alien'),
+			new CensusColumnNull($this, 'NatY', 'If naturalized, year of naturalization'),
+			new CensusColumnNull($this, 'School', 'Attended school since Sept. 1, 1919'),
+			new CensusColumnNull($this, 'Read', 'Whether able to read'),
+			new CensusColumnNull($this, 'Write', 'Whether able to write'),
+			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth'),
+			new CensusColumnNull($this, 'Language', 'Mother tongue'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Father’s birthplace', 'Place of birth of father'),
+			new CensusColumnNull($this, 'Father language', 'Mother tongue of father'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Mother’s birthplace', 'Place of birth of mother'),
+			new CensusColumnNull($this, 'Mother language', 'Mother tongue of mother'),
+			new CensusColumnNull($this, 'English', 'Whether able to speak English'),
+			new CensusColumnOccupation($this, 'Occupation', 'Trade, profession, or particular kind of work done'),
+			new CensusColumnNull($this, 'Ind', 'Industry, business of establishment in which at work'),
+			new CensusColumnNull($this, 'Emp', 'Employer, salary or wage worker, or work on own account'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1930.php b/app/Census/CensusOfUnitedStates1930.php
index b1467e2938..09bc4f61e1 100644
--- a/app/Census/CensusOfUnitedStates1930.php
+++ b/app/Census/CensusOfUnitedStates1930.php
@@ -35,7 +35,38 @@ class CensusOfUnitedStates1930 extends CensusOfUnitedStates implements CensusInt
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnNull($this, 'XXXX', 'XXXX'),
+			new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
+			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+			new CensusColumnNull($this, 'Home', 'Home owned or rented'),
+			new CensusColumnNull($this, 'Value/rent', 'Value of house, if owned, or monthly rental if rented'),
+			new CensusColumnNull($this, 'Radio', 'Radio set'),
+			new CensusColumnNull($this, 'Farm', 'Does this family live on a farm'),
+			new CensusColumnSexMF($this, 'Sex', 'Sex'),
+			new CensusColumnNull($this, 'Race', 'Color or race'),
+			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
+			new CensusColumnNull($this, 'Condition', 'Whether single, married, widowed, or divorced'),
+			new CensusColumnNull($this, 'Age married', 'Age at first marriage'),
+			new CensusColumnNull($this, 'School', 'Attended school since Sept. 1, 1929'),
+			new CensusColumnNull($this, 'Read/write', 'Whether able to read and write'),
+			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth'),
+			new CensusColumnFatherBirthPlaceSimple($this, 'Father’s birthplace', 'Place of birth of father'),
+			new CensusColumnMotherBirthPlaceSimple($this, 'Mother’s birthplace', 'Place of birth of mother'),
+			new CensusColumnNull($this, 'Language', 'Language spoken in home before coming to the United States'),
+			new CensusColumnNull($this, '?', 'Code'),
+			new CensusColumnNull($this, '?', 'Code'),
+			new CensusColumnNull($this, '?', 'Code'),
+			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
+			new CensusColumnNull($this, 'Nat', 'Naturalization'),
+			new CensusColumnNull($this, 'English', 'Whether able to speak English'),
+			new CensusColumnOccupation($this, 'Occupation', 'Trade, profession, or particular kind of work done'),
+			new CensusColumnNull($this, 'Industry', 'Industry, business of establishment in which at work'),
+			new CensusColumnNull($this, 'Code', 'Industry code'),
+			new CensusColumnNull($this, 'Emp', 'Class of worker'),
+			new CensusColumnNull($this, 'Work', 'Whether normally at work yesterday or the last regular working day'),
+			new CensusColumnNull($this, 'Unemp', 'If not, …'),
+			new CensusColumnNull($this, 'Veteran', 'Whether a veteran of U.S. military or …'),
+			new CensusColumnNull($this, 'War', 'What war or …'),
+			new CensusColumnNull($this, '?', '…'),
 		);
 	}
 }