More work. Changed nearly every line.... guess that means it is not quite done yet