Ibm challenge
The ibm challenge branch contains changes required to run the ibm challenge files. Since the main codebase is almost unaffacted I think we can merge this back into the master branch just to keep the codebase consolidated. It would be cumbersome to optimise the mapper tool and then port back the changes separately to to IBM branch.