Initial re commit of all code