Complete working implementation with basic testing.
Turn off pending comments.
Clean up test code.
WIP u : update file names and writite first tests.