+1 for seperate. It should be easy to make this a drop in replacement without other baggage.