Initial commit of working code