Start porting over some focus measures from older code.