Lets get rid of this pre-processor. I am happy to drop this idea (it was just a bit of an experiment anyway)