N*2.1 Continuing DCS implementation (with new test files), added a lot of TODOs !