most of the changes in this file are merely to make sure this runs in the appropriate order without mixing Framework styles. Im not doing a full / clean update to bdd. just making sure style is used consistently.