Initial commit of code moved from other repo