moved some new master branch stuff into the tracpy class, where it should be