Moving to a more testable model (adding args passing)
1.0.3