Work in progress
More work in progress, please ignore
More WIP
Have some useful code now
Removed few print statements, fixed table names in tests to avoid name conflict
Removed unused file, removed info arg from password column declaration
removed changes to doc
Cherrypicked changed from develop branch to prepare for merge
Merge branch 'ben_work_in_progress' into develop