Work in progress update to .7.3