Ok, don't merge this yet then.  

I'll change a few things and get it so you can do it to those defaults