grab testing in progress; merging master stuff now