Refs #100 #117: Prepared for 2.0