7.x 2.x basic 908

# Ready For Review
@cjwest, Please review to ensure that everything looks ok.