Working update of 1-body changes ... overlap compiles, testing next