New working code in progress for 4/3