Refactor for a single init.
Upping version to accomidate changes.