Merge pull request #444 from Masterminds/feat/reworked-init

Rework create/init