Updates to prepare for SQL implementation
Merge pull request #30 from aceofspades/prepare_for_sql

Updates to prepare for SQL implementation