Initial commit of stand alone version