@jeffkaufman 
Pull updated & force pushed - could you have another look? 
I think this could use system tests for the new options, should I add those too?