Input refactor dependency injection, has now output (can stylize)
Merge remote-tracking branch 'origin/master'