Moving code into my mainline.