More dickering with code stuff