more testing + debugging + dev (see diff or whatever)