I rather spend a day in refactoring but not end up with a broken agent my whole app is around this agent