Refactored all the binding code.  Got constructor injection working.. mostly... mostly
changed to inject factory