Finish up porting info over for issue #8