Initial commit - some code cleaning required, experiment still to be reorganized