Initial work on #913
Implement first batch of configuration flags for #913
More configuration flags for #913
More work on #913