Initial commit
added conc-conv and tidied