first commit of Marc's TnP code