update TODO list for next release, implemente a test for testing the exchange functionality with erb options
merge conflicts in TODO