In the middle of trying to fix edit