Wrap.cpp added and Wrap.hh updated