ADD/CHG/DEL: stuffy stuff stuff - huge commit