More work toward 1.2.0: