Clean up of the init

@moritz.huebner @colm.talbot @paul-lasky

I'm not 100% committed to this yet, but I thought I'd sketch it out and we can discuss.

I'll take blame for initially adding in lots of these shortcuts, but ultimately I think going forward we need a clean infrastructure.