address comments

change the two .py files although I think that the .py
files and the .sql files should be removed from the
pull request after you guys ok them.