Filling in more gaps.
Renamed args.cpp to SHWrapper.cpp
Finally added in highly modified SHWrapper.cpp