Start of rework to bring this up to date