supposedly done. trying to run.   Will run then try to simplify