Trajectory

I'll remove the macros once you have removed the CLR benchmarks project.