Monday's work- nearly done, just debugging.