Got most of the updating done for D7