Added extra field support in the "database".
Merge pull request #1 from joemcmahon/master

Database updates

Reviewed with Joe. 

Thanks for helping with the perlish parts I needed to understand better!