Updated Changes before these get moved to thier own branch since I
messed up and should have done this in the first place.