Moving to a plugin infrastructure and adding the 2nd problem
Problem #2