Work on 1NF
Refs #master - Begin 2NF.