Pushed all of the extra code still working on automatically manipulating the results for the attributes