NOt completed but need to pull from nhoffman to continue development
NOt completed but need to pull from nhoffman to continue development
merging with nhoffman master