Refactor rejig function so it’s a bit clearer
Merge branch 'master' into 19-cli

Conflicts:
	app.js