Reverting Juans changes to put in some breakpoints and testing