Move Chris's code into source

I'm taking the changes that Chris made and getting them back into the
source so we have a single place for the source code.
Updates after the build process
Merge pull request #1 from JoeReed/adding_fields

Adding fields