I like the idea a lot, but I am not volunteering. Do you want to refactor it? How much time would it take?