I feel like I am un reverting the changes but this seems to work now so (shrug)