Broken specs, but refactoring to DI Parse
Specs passing