Merge branch 'separate-cli' into separate-mvc-components
Load filters calling controlling code

Should use dependency injection where practical.