Things are still working...no huge changes. Still more work to do...