Added the additional pieces of code.  Need to clean it up and move
everything to python